Rename resolve_dependencies -> resolve_ws_precisely

diff --git a/src/cargo/ops/cargo_compile.rs b/src/cargo/ops/cargo_compile.rs
index b2027b9917bc74f9cf294626eab44a2e78b07457..1be87408ab426ec8202ab58e188d337e8ca814cc 100644 (file)
--- a/src/cargo/ops/cargo_compile.rs
+++ b/src/cargo/ops/cargo_compile.rs
@@ -141,7 +141,7 @@ pub fn compile_ws<'a>(ws: &Workspace<'a>,
     let profiles = ws.profiles();
 
     let specs = spec.into_package_id_specs(ws)?;
-    let resolve = ops::resolve_dependencies(ws,
+    let resolve = ops::resolve_ws_precisely(ws,
                                             source,
                                             features,
                                             all_features,

diff --git a/src/cargo/ops/cargo_output_metadata.rs b/src/cargo/ops/cargo_output_metadata.rs
index 673e753bc4c47dc37c1c7574ffba538866a18ec4..e86a4de41896312d9653d76d10a79bf98881006f 100644 (file)
--- a/src/cargo/ops/cargo_output_metadata.rs
+++ b/src/cargo/ops/cargo_output_metadata.rs
@@ -44,7 +44,7 @@ fn metadata_no_deps(ws: &Workspace,
 fn metadata_full(ws: &Workspace,
                  opt: &OutputMetadataOptions) -> CargoResult<ExportInfo> {
     let specs = Packages::All.into_package_id_specs(ws)?;
-    let deps = ops::resolve_dependencies(ws,
+    let deps = ops::resolve_ws_precisely(ws,
                                          None,
                                          &opt.features,
                                          opt.all_features,

diff --git a/src/cargo/ops/mod.rs b/src/cargo/ops/mod.rs
index b727456b6fe3cf4ee7d8141fac0a7d413574ae80..865b740948c950aa9e1d301904ae15295a52ad24 100644 (file)
--- a/src/cargo/ops/mod.rs
+++ b/src/cargo/ops/mod.rs
@@ -20,7 +20,7 @@ pub use self::registry::{registry_login, search, http_proxy_exists, http_handle}
 pub use self::registry::{modify_owners, yank, OwnersOptions, PublishOpts};
 pub use self::cargo_fetch::fetch;
 pub use self::cargo_pkgid::pkgid;
-pub use self::resolve::{resolve_ws, resolve_dependencies, resolve_with_previous};
+pub use self::resolve::{resolve_ws, resolve_ws_precisely, resolve_with_previous};
 pub use self::cargo_output_metadata::{output_metadata, OutputMetadataOptions, ExportInfo};
 
 mod cargo_clean;

diff --git a/src/cargo/ops/resolve.rs b/src/cargo/ops/resolve.rs
index 1c1b21ca4c28e701e63a019361ea7005d2ed6e54..b1f33a2d26e96cea01765f41f489650cc796ba6e 100644 (file)
--- a/src/cargo/ops/resolve.rs
+++ b/src/cargo/ops/resolve.rs
@@ -7,7 +7,7 @@ use sources::PathSource;
 use ops;
 use util::{profile, human, CargoResult, ChainError};
 
-/// Resolve all dependencies for the specified `package` using the previous
+/// Resolve all dependencies for the workspace using the previous
 /// lockfile as a guide if present.
 ///
 /// This function will also write the result of resolution as a new
@@ -19,7 +19,9 @@ pub fn resolve_ws<'a>(ws: &Workspace<'a>) -> CargoResult<(PackageSet<'a>, Resolv
     Ok((packages, resolve))
 }
 
-pub fn resolve_dependencies<'a>(ws: &Workspace<'a>,
+/// Resolves dependencies for some packages of the workspace,
+/// taking into account `paths` overrides and activated features.
+pub fn resolve_ws_precisely<'a>(ws: &Workspace<'a>,
                                 source: Option<Box<Source + 'a>>,
                                 features: &[String],
                                 all_features: bool,